From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 14 Mar 2013 15:51:10 +0000 (-0400)
Subject: popupMenu: Fix another child popup regression
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4386
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6fd5f0e3de7a51d7b64e1f90772cbdcf2d361699;p=gnome-shell.git

popupMenu: Fix another child popup regression

When switching menus, we need to make sure we close all existing
grabs, not just the first one.

https://bugzilla.gnome.org/show_bug.cgi?id=695859
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 3d2b4e60c..b751daf9e 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -2110,9 +2110,9 @@ const PopupMenuManager = new Lang.Class({
     },
 
     get activeMenu() {
-        let actor = this._grabHelper.currentGrab.actor;
-        if (actor)
-            return actor._delegate;
+        let firstGrab = this._grabHelper.grabStack[0];
+        if (firstGrab)
+            return firstGrab.actor._delegate;
         else
             return null;
     },